bitkeeper revision 1.1236.4.1 (421f9dcbHJkjrRCLRtqvTdb-LhoYMg)

vcpu.c:
  Fix invalid comparison between exec_domain * and domain *

diff --git a/xen/arch/ia64/vcpu.c b/xen/arch/ia64/vcpu.c
index 3c425dd81deb51cba221753c78f61d387759ae79..6b7ba004b074e0cf8a02e497da42981c7364c29e 100644 (file)
--- a/xen/arch/ia64/vcpu.c
+++ b/xen/arch/ia64/vcpu.c
@@ -1421,7 +1421,7 @@ extern struct domain *dom0;
 void vcpu_itc_no_srlz(VCPU *vcpu, UINT64 IorD, UINT64 vaddr, UINT64 pte, UINT64 logps)
 {
        unsigned long psr;
-       unsigned long ps = (vcpu==dom0) ? logps : PAGE_SHIFT;
+       unsigned long ps = (vcpu->domain==dom0) ? logps : PAGE_SHIFT;
 
        // FIXME: validate ifa here (not in Xen space), COULD MACHINE CHECK!
        // FIXME, must be inlined or potential for nested fault here!